wrong types used here, breaks 64bit bigendian
authorCaolán McNamara <caolanm at>
Tue, 6 Mar 2012 09:37:35 +0000 (09:37 +0000)
committerRene Engelhard <rene@debian.org>
Wed, 1 Aug 2012 08:41:17 +0000 (08:41 +0000)
Gbp-Pq: Name fix-Test-BigPtrArray-on-64bit-bigendian.diff

sw/qa/core/Test-BigPtrArray.cxx

index 7953dc30287b8b3167f6a5a27cf23dc98a90a966..d9be7a284504f18c97a1d1d9e5e2cb7a0b7e8b7a 100644 (file)
@@ -82,7 +82,7 @@ namespace /* private */
     sal_Bool AddToCount(const ElementPtr& rElem, void* pArgs)
     {
         BigPtrEntryMock* const pbem = static_cast<BigPtrEntryMock* const>(rElem);
-        pbem->setCount(pbem->getCount() + *((int*)pArgs));
+        pbem->setCount(pbem->getCount() + *((sal_uLong*)pArgs));
         return true;
     }
 
@@ -655,7 +655,7 @@ public:
         fillBigPtrArray(bparr, NUM_ENTRIES);
         dumpBigPtrArray(bparr);
 
-        int addCount = 1;
+        sal_uLong addCount = 1;
         bparr.ForEach(AddToCount, &addCount);
 
         for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
@@ -715,7 +715,7 @@ public:
         fillBigPtrArray(bparr, NUM_ENTRIES);
         dumpBigPtrArray(bparr);
 
-        int addCount = 1;
+        sal_uLong addCount = 1;
         bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount);
 
         sal_uLong i = 0;